From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 10 Jul 2008 16:29:06 +0000 (+0100)
Subject: ioemu: drop unused 4MB video memory
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14188^2~51
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=d91284f8884f8645f301497658d447cde7bb00ae;p=xen.git

ioemu: drop unused 4MB video memory

Since we only emulate the cirrus VGA video card which is only able to
expose 4MB video memory, we don't need more than that.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
---

diff --git a/tools/ioemu/vl.h b/tools/ioemu/vl.h
index c0e2381030..aa26005a8b 100644
--- a/tools/ioemu/vl.h
+++ b/tools/ioemu/vl.h
@@ -927,7 +927,7 @@ extern struct soundhw soundhw[];
 
 /* vga.c */
 
-#define VGA_RAM_SIZE (8192 * 1024)
+#define VGA_RAM_SIZE (4096 * 1024)
 
 /* in ms */
 #define GUI_REFRESH_INTERVAL 30
diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 615e56da0f..0389f05aac 100644
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -833,8 +833,8 @@ class IA64_HVM_ImageHandler(HVMImageHandler):
         # buffer io page, buffer pio page and memmap info page
         extra_pages = 1024 + 5
         mem_kb += extra_pages * page_kb
-        # Add 8 MiB overhead for QEMU's video RAM.
-        return mem_kb + 8192
+        # Add 4 MiB overhead for QEMU's video RAM.
+        return mem_kb + 4096
 
     def getRequiredInitialReservation(self):
         return self.vm.getMemoryTarget()
@@ -876,8 +876,8 @@ class X86_HVM_ImageHandler(HVMImageHandler):
         return rc
 
     def getRequiredAvailableMemory(self, mem_kb):
-        # Add 8 MiB overhead for QEMU's video RAM.
-        return mem_kb + 8192
+        # Add 4 MiB overhead for QEMU's video RAM.
+        return mem_kb + 4096
 
     def getRequiredInitialReservation(self):
         return self.vm.getMemoryTarget()